urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-23 10:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,091 Commits 768 Branches 10 Tags 215 MiB
fc6530fa30
Commit Graph

485 Commits

Author SHA1 Message Date
C. Guy Yarvin
7cfdd36fab Change u2 to u3. 2014-09-05 13:13:24 -07:00
C. Guy Yarvin
f0d6edce20 A bunch of restructuring. 2014-09-05 12:55:16 -07:00
C. Guy Yarvin
14c22cf9da Yes. 2014-09-04 10:03:38 -07:00
C. Guy Yarvin
68715087b2 More reorgs. 2014-09-03 20:44:53 -07:00
C. Guy Yarvin
2cc897c410 Last remains of old jet mangling. 2014-09-03 20:10:43 -07:00
C. Guy Yarvin
6fa6b15cb8 More renaming, etc. 2014-09-03 19:28:15 -07:00
C. Guy Yarvin
bd6bfa1fad Finish renaming etc. 2014-09-03 14:33:18 -07:00
C. Guy Yarvin
6d52238ac1 Considerable refactorings. 2014-09-02 22:46:55 -07:00
C. Guy Yarvin
b4ce2f98f5 Update cq names. 2014-09-02 20:36:29 -07:00
C. Guy Yarvin
2d9af9f04e Before jet renaming. 2014-09-02 19:58:36 -07:00
C. Guy Yarvin
882e8e226b Ready to switch over mug. 2014-09-02 13:13:12 -07:00
C. Guy Yarvin
0504873d42 Better to commit than stash. 2014-09-02 11:21:38 -07:00
C. Guy Yarvin
a6ea515d2a Jet dispatcher compiles and links. 2014-09-01 17:10:04 -07:00
C. Guy Yarvin
d7018b3310 Various fixes and improvements. 2014-08-28 12:40:40 -07:00
C. Guy Yarvin
e75d2e70b2 Add MurmurHash3. 2014-08-26 12:11:59 -07:00
C. Guy Yarvin
3ff6a88ca6 Various fixes and improvements. 2014-08-26 09:12:45 -07:00
C. Guy Yarvin
af5352fc1a Incorporate HAMT into meme.c; delete old BPT. 2014-08-25 14:35:37 -07:00
C. Guy Yarvin
66bd19ed0a Various fixes and improvements. 2014-08-25 02:58:38 -04:00
C. Guy Yarvin
a5a89eb3eb No longer used. 2014-08-22 11:46:19 -04:00
C. Guy Yarvin
549ff28b41 Speed up interpreter with gcc CLZ intrinsic. 2014-08-22 02:14:37 -04:00
C. Guy Yarvin
c0326a0c06 More memory improvements. 2014-08-22 02:05:41 -04:00
C. Guy Yarvin
dfe2c1aab2 Nouns and memory appear to work properly... 2014-08-21 21:40:06 -04:00
C. Guy Yarvin
8902578d4f Debugging meme. 2014-08-21 09:10:03 -04:00
C. Guy Yarvin
3a45cdf08f Adjust refcounts in u2_cj_*. 2014-08-20 17:24:29 -04:00
C. Guy Yarvin
d9962abb69 All jets now compile cleanly. 2014-08-20 17:18:34 -04:00
C. Guy Yarvin
59c7d865dc Stashing. 2014-08-20 13:14:51 -04:00
C. Guy Yarvin
f06ba7242a Convert tier 5 to new noun layer. 2014-08-20 02:22:41 -04:00
C. Guy Yarvin
25cd41d204 Tier 4. 2014-08-20 00:30:55 -04:00
C. Guy Yarvin
f347b84db5 Adapt tiers 1 and 2 to new jets. 2014-08-19 17:49:16 -04:00
C. Guy Yarvin
c67a1e5c51 Just a stash. 2014-08-19 15:01:52 -04:00
C. Guy Yarvin
b73db123f5 Stashing, basically. 2014-08-18 14:21:44 -04:00
C. Guy Yarvin
fe45c85bf4 Tested allocator. 2014-08-18 02:10:46 -04:00
C. Guy Yarvin
2b5ce7ae10 Full meme layer ready to replace coal. 2014-08-16 23:57:54 -04:00
C. Guy Yarvin
51e3600238 Noun read routines compile. 2014-08-16 20:20:24 -04:00
C. Guy Yarvin
9aefb8f89f Translate some memory code. 2014-08-13 12:32:14 -07:00
C. Guy Yarvin
4f1377a91c Various fixes and improvements. 2014-08-10 20:09:56 -07:00
C. Guy Yarvin
87be8b64b4 Install another bandaid. 2014-08-06 13:15:20 -07:00
C. Guy Yarvin
5c3223ba1f More memory pls. 2014-07-31 13:23:02 -07:00
C. Guy Yarvin
64be83c562 Various fixes and improvements. 2014-07-30 10:53:30 -07:00
pcmonk
c4b8f78afb %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
C. Guy Yarvin
75e61cf916 Various fixes and improvements. 2014-07-05 14:26:35 -07:00
C. Guy Yarvin
e8d7ead9ba Various fixes and improvements. 2014-06-30 18:15:56 -07:00
C. Guy Yarvin
b2cabcc281 Trailing whitespace and stuff. 2014-06-26 21:02:05 -07:00
C. Guy Yarvin
e21d615beb %ames to %gall as /q/gm/[app]/[logo]. 2014-06-26 05:18:30 -07:00
Luke Patmore
d8fc596038 Moar ap.c macro expansions 2014-06-18 13:09:04 -07:00
Luke Patmore
e162abc6db Added bunting macro expansions to ap.c 2014-06-17 11:04:27 -07:00
Luke Patmore
396c2d1c7f Moar ap.c fixes, added macro expansions 2014-06-13 15:30:36 -07:00
Luke Patmore
147a423a3f Improvements to ap.c 2014-06-13 13:52:13 -07:00
Luke Patmore
4cf4ca57d9 Added moar ap.c macro expansions. 2014-06-12 15:22:25 -07:00
Luke Patmore
f0f3c7bd57 Added moar macro expansions to ap.c 2014-06-11 15:29:17 -07:00
Luke Patmore
22313fbcf4 Added macro expansions for bczp, brls, cncb, cnzy, and cnzz to ap.c 2014-06-11 13:16:34 -07:00
C. Guy Yarvin
572879423d Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 2014-06-11 07:06:56 -07:00
C. Guy Yarvin
eba681be49 Various fixes and improvements. 2014-06-11 07:06:36 -07:00
Luke Patmore
810f83bc6f Added wtkt macro expansion 2014-06-10 17:51:43 -07:00
Luke Patmore
ce0ad53cc2 Improvements to ap.c 2014-06-10 14:31:16 -07:00
~hatteb-mitlyd
c35b08e16f partially negotiate char-at-a-time telnet mode 2014-06-07 16:05:53 -07:00
~hatteb-mitlyd
50efa32a2b remove wipe, change boil 2014-06-07 13:58:29 -07:00
~hatteb-mitlyd
4344e97cb8 crash less often with dead terminals 2014-06-07 13:20:51 -07:00
~hatteb-mitlyd
c3727ee120 Don't overload the hole card 2014-06-07 13:18:13 -07:00
~hatteb-mitlyd
19ce1e5ffb reorg tty struct 2014-06-07 12:27:48 -07:00
~hatteb-mitlyd
f8f3ae7968 first hack at telnet 2014-06-07 12:27:47 -07:00
Luke Patmore
2ab9b9a78c Whitespace: the invisible killer 2014-06-04 19:46:12 -07:00
~hatteb-mitlyd
232c80ada5 beginning stages of fake-net hackery 2014-06-03 16:39:28 -07:00
~hatteb-mitlyd
dd0104dbce Add basic synclog code to try and track sync issues 2014-05-31 20:26:18 -07:00
~hatteb-mitlyd
c819b4c034 Merge remote-tracking branch 'origin/newbreach' 
Update protocol for breach.

Conflicts:
	f/trac.c
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
	v/raft.c
 2014-05-30 17:56:12 -07:00
C. Guy Yarvin
81d5e748f9 Merge branch 'newbreach' of github.com:urbit/urbit into newbreach 
Conflicts:
	urb/zod/arvo/hoon.hoon
 2014-05-20 10:36:10 -07:00
~hatteb-mitlyd
37e351528e wire up delete/get/put in cttp 2014-05-18 18:49:59 -07:00
~hatteb-mitlyd
7881861296 sync palliative: check after block, not before 2014-05-13 16:34:09 -07:00
~hatteb-mitlyd
4daa9a6ed9 remove URBIT_HOME 
New piers are structured as so:

cpu/.urb/{urbit.pill,chk,sis,get,put,code.~dansut-docfyn}
cpu/dansut-docfyn-dozzod-dozzod--dozzod-dozzod-dozzod-dozzod/{try,main,arvo}
 2014-05-13 12:22:07 -07:00
~hatteb-mitlyd
43c3988995 add exit code to %logo card 2014-05-12 15:42:43 -07:00
~hatteb-mitlyd
a5e0972193 Merge branch 'master' into newbreach 2014-05-12 11:12:37 -07:00
~hatteb-mitlyd
a1a62f2d1a eviscerate u2_ho_cash 2014-05-12 10:51:53 -07:00
~hatteb-mitlyd
c51892324f convert nash to store value pointers 2014-05-12 10:51:52 -07:00
Steve Dee
66700aada4 Merge remote-tracking branch 'urbit/master' into newbreach 
Conflicts:
	.gitignore
	Makefile
	urb/urbit.pill

Took both bpt and ed25519, and generated a new pill starting from master's.
 2014-05-08 14:53:12 -07:00
~hatteb-mitlyd
65e621150f style 2014-05-07 11:36:48 -07:00
Steve Dee
3b7734336c Merge branch 'master' into newbreach 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
 2014-04-25 18:39:29 -07:00
~hatteb-mitlyd
aacbe8f4da use a non-noun-based hashtable to jam 2014-04-23 19:55:53 -07:00
C. Guy Yarvin
29ca4f9fe2 Fix ames timer to actually work. 2014-04-23 10:02:36 -07:00
Steve Dee
322d448d0f Jetted en and ex 
You'll note that ex involves more endianness twiddling. This is
unfortunate, but en is exactly as stupid as you'd hope it would be,
so I'm going to call it okay.

Also, fixed ex. In particular, (ex:aesc 0) now agrees with the C's
output. Our bad.
 2014-04-18 14:58:51 -07:00
Steve Dee
a0e835ecd8 Merge branch 'master' into newbreach 
Took master's pill.

Conflicts:
	Makefile
	urb/urbit.pill
 2014-04-16 10:53:50 -07:00
C. Guy Yarvin
1317ac3c1e Clean up requests from dead connections. 2014-04-14 11:01:18 -07:00
Steve Dee
a5a3d0d85d Fix for 64-bit sequence numbers 2014-04-09 13:31:00 -07:00
Steve Dee
c9a4cf19cf 64-bit entry numbers 2014-04-08 09:25:49 -07:00
~hatteb-mitlyd
93d5722faa remove the old poll-based term stuff in favor of a uv_pipe 2014-04-03 14:47:22 -07:00
~hatteb-mitlyd
75dce9eefc make asserting malloc into a #define 2014-04-03 14:37:32 -07:00
~hatteb-mitlyd
a0c18f56b2 change to asserting malloc 2014-04-01 17:48:26 -07:00
Steve Dee
fd3c03fa73 Options cleanup 
Remove sow, pas, and rez. Add comments with flags and short
descriptions. Also correctly bound ports.
 2014-03-31 07:46:54 -07:00
Steve Dee
b7c6df667c Add flag to skip the last event 
Handy when that event causes disastrous repercussions at the C level.
On the whole, terrible. Note that the flag is spelled "-Xwtf",
pronounced "pleaXe wipe that fscker".
 2014-03-28 11:38:23 -07:00
Steven Dee
5c68bb4de6 fpurge stopped working on Arch at some point 2014-03-25 08:43:52 -07:00
~hatteb-mitlyd
d5c61a3038 use a uv_prepare callback to scan fs tree 
Much more responsive file sync.
 2014-03-24 11:31:03 -07:00
C. Guy Yarvin
c837404578 A bunch of web fixes. Preparing to proxy. 2014-03-21 14:46:14 -07:00
C. Guy Yarvin
55c9f41b14 Merge branch 'master' of github.com:urbit/urbit 2014-03-19 15:42:12 -07:00
C. Guy Yarvin
56a61c1c7f Add a pseudo-secure http server. 2014-03-19 15:40:40 -07:00
~hatteb-mitlyd
e7a75fed3c separate out needs-handshake from SSL-is-open status 
no longer responds to "no request"
 2014-03-18 17:29:52 -07:00
~hatteb-mitlyd
4370e1ecc0 closer, no longer loops infinitely 2014-03-18 17:29:51 -07:00
~hatteb-mitlyd
1abfee3d03 works a little better, but is shoving SSL data into the parser 2014-03-18 17:29:51 -07:00
~hatteb-mitlyd
65aba238a8 first-line work on SSLifying the HTTP client 
doesn't work at all, because the encrypted buffer never gets written to the net
 2014-03-18 17:29:51 -07:00
Steve Dee
bf3e5568da Comments on raft data structures 2014-03-14 11:02:46 -07:00
Steve Dee
ba71f7ca11 Trailing whitespace cleanup, C level 2014-03-14 10:50:12 -07:00
Steve Dee
f4f1c711d5 New event log format including term and type 2014-03-10 16:14:21 -07:00
Steve Dee
6a3a939c4a Fix for duplicate vote responses 2014-03-10 12:18:18 -07:00
Steve Dee
c5bb5bb5e7 Moronic key-value store 
This is kind of dumb, but we need to persist stuff for Raft, and
we can't touch noun state from followers.
 2014-03-07 19:12:27 -08:00
Steve Dee
8aa97708f4 Fix a stupid in c3_log_every 2014-03-07 19:12:21 -08:00
Steve Dee
f92eaf970c Clean up Raft options and init 
I opted to keep u2_opts to just numbers, strings, and beans for now and
parse them to peer names in the Raft init code.
 2014-03-07 16:19:38 -08:00
Steve Dee
4287bad4df Remove trailing capnproto stuff 2014-03-07 12:09:52 -08:00
Steve Dee
1e10cd5d95 Clean up connections 
The code seems much less racy now.
 2014-03-07 20:00:44 +00:00
Steven Dee
7c7c044525 Add ron_u->liv 
This prevents us from double-killing connections in races, e.g. the
one between _raft_rest_name and _raft_connect_cb.
 2014-03-07 20:00:44 +00:00
Steve Dee
9e2f12fb80 Leader election appears to work 2014-03-06 08:59:20 -08:00
Steve Dee
66fedab1fe Raft message sending working 2014-03-06 08:59:20 -08:00
Steve Dee
008558a1f7 WIP hand-rolled parsing, read side 2014-03-06 08:59:20 -08:00
Steve Dee
d045f31f23 Rejigger the event loop again 2014-03-06 08:59:20 -08:00
Steve Dee
424af0354d WIP Raft network base 2014-03-06 08:59:19 -08:00
C. Guy Yarvin
dd4a42b345 Some HTTP client fixes. 2014-03-03 11:51:35 -08:00
C. Guy Yarvin
3400b6bacb Working HTTP client. 2014-03-02 14:31:03 -08:00
C. Guy Yarvin
a7055224fa Various HTTP client fixes. 2014-02-26 17:58:40 -08:00
C. Guy Yarvin
54ed2bdcb0 More C files. 2014-02-26 16:40:53 -08:00
C. Guy Yarvin
a4243793a3 Added cttp. 2014-02-26 16:37:47 -08:00
Steve Dee
edc28b9ba7 Get new event loop working with checkpoints 
Modifying u2_reck is a bad idea in the face of checkpoints. Just stick
everything on roe. This actually cleans up the logic a bit -- we can
execute non-core-modifying actions immediately, rather than on the next
tick.
 2014-02-25 12:18:18 -08:00
Steve Dee
d7e4c46150 Revert "Revert "Merge remote-tracking branch 'urbit/master' into master"" 
This reverts commit dc6f72fa0a8ff2097b1e9c900ebec444c0d4c24f.
 2014-02-25 12:18:07 -08:00
Steve Dee
de5048e895 Revert "Merge remote-tracking branch 'urbit/master' into master" 
This reverts commit d52d2835b96f89e7ebbe5392c99f1483d165ee0b, reversing
changes made to 58838ea246e52c064719edc56e29b6a1ba713fdf.

Conflicts:
	Makefile
 2014-02-24 11:27:57 -08:00
Steve Dee
9b992ae438 Merge remote-tracking branch 'urbit/master' into master 
Conflicts:
	v/loop.c
 2014-02-24 10:45:10 -08:00
Steve Dee
6143fe46b2 Back out log format version bump 2014-02-24 10:29:08 -08:00
Steve Dee
ef3c34c803 Modify proto 2014-02-24 10:16:42 -08:00
Steve Dee
575f28cef0 Commit on next libuv cycle in single-instance mode 2014-02-19 13:57:17 -08:00
Steve Dee
a957cd649e WIP cleanup and fixes 2014-02-18 16:48:46 -08:00
Steve Dee
e0e37cc569 Splinter disk persistence and reck stuff back out 2014-02-17 18:21:24 -08:00
Steve Dee
704dfd6d85 Write term and log type, in preparation for raft 2014-02-17 17:56:42 -08:00
Steve Dee
6311263513 Remove unreferenced tube.h 2014-02-17 17:03:49 -08:00
C. Guy Yarvin
6c22acbfa7 Some memory palliatives. 2014-02-14 17:35:22 -08:00
Steve Dee
6182bd7d14 New event loop working, super rough cut 2014-02-14 15:15:38 -08:00
Steve Dee
27b50018a4 More loop -> raft, add u2_raft_boot 2014-02-12 17:27:09 -08:00
Steve Dee
2d5f78e39a WIP Move lug_u to u2_raft 2014-02-12 11:50:24 -08:00
Steve Dee
5db81ccab7 Trivial fixups 2014-02-12 11:50:05 -08:00
Steve Dee
580a7323f4 WIP Make _lo_work rafty 
Carts are now batches of events waiting to be or just recently
persisted. _lo_work calls u2_reck_kick on the last batch of events,
removes every batch that's been through Raft, and then prepares the next
batch.

TODO make _lo_punk et al stick things on roe

TODO move disk persistence to raft.c

TODO raft_push: lo_open / mark / lo_shut
 2014-02-11 12:57:41 -08:00
Steve Dee
30061584bc Add raft.capnp 2014-02-10 16:07:22 -08:00
Steve Dee
5a16660af1 Skeleton for raft 2014-02-10 16:07:09 -08:00
Steve Dee
6df5fb3155 New-style raft options 2014-02-05 15:25:57 -08:00
Steve Dee
ec82c58982 Fix comment 2014-02-05 15:25:57 -08:00
Steve Dee
c91e950eb7 Add raft listener/peers 2014-02-05 15:25:57 -08:00
Steven Dee
bb9a4858d6 No lseek64 on OpenBSD 2014-01-30 10:37:58 -08:00
C. Guy Yarvin
a5fee9936b Various fixes and improvements. 2014-01-27 11:09:56 -08:00
Curtis Yarvin
ae489b86da Quick 64-bit fixes. 2014-01-27 18:48:55 +00:00
Steve Dee
2b1077899e Add hostname 2014-01-17 09:42:47 -08:00
Steve Dee
ed09e5d12e Bring up listeners after boot 2014-01-17 00:12:05 -08:00
Steve Dee
97eeb27d41 Batch pier creation 2014-01-15 17:41:30 -08:00
Kingdon Barrett
7d19f2ed33 -p to demand a listen port in ames 2014-01-15 12:16:50 -05:00
C. Guy Yarvin
73ff3bb203 Merge branch 'funbreach' 
Conflicts:
	urb/urbit.pill
 2014-01-06 12:46:49 -08:00
C. Guy Yarvin
98006a2851 Last checkin on funbreach. 2014-01-06 12:37:42 -08:00
C. Guy Yarvin
2f83452f42 Refactor peek. 2014-01-05 16:02:34 -08:00
C. Guy Yarvin
3a59ebb210 dtpt and dtsg are gone. 2014-01-04 19:56:33 -08:00
C. Guy Yarvin
431fed0f71 About to remove cnbc and cnhx. 2014-01-04 19:18:06 -08:00
C. Guy Yarvin
2d9019a93d Hint refactoring. 2014-01-04 14:57:44 -08:00
C. Guy Yarvin
d4ebecde86 Fix a %bull bug. 2014-01-04 12:19:59 -08:00
C. Guy Yarvin
10ce9fc5a9 Steady before great ~ renaming. 2014-01-04 11:30:20 -08:00
C. Guy Yarvin
a259e04a28 Various fixes and improvements. 2014-01-03 23:28:16 -08:00
C. Guy Yarvin
b5eacfa6b9 Preparing to install wt?z. 2014-01-03 18:59:56 -08:00
C. Guy Yarvin
cd946cddfb Preparing to redo wts. 2013-12-31 12:11:16 -08:00
C. Guy Yarvin
8175d0ef07 New model bull. 2013-12-31 11:30:37 -08:00
Steve Dee
d95f2cc376 Proper daemon mode noun garbage fix 2013-12-29 17:30:45 +01:00
Steve Dee
d03c8d9e4d s/v/f/ 2013-12-28 12:43:35 +01:00
C. Guy Yarvin
2b78e93642 Various %bull-related updates. 2013-12-26 12:12:07 -05:00
C. Guy Yarvin
6faa9c453a Merge branch 'master' of github.com:urbit/urbit 2013-12-20 18:49:25 -08:00
C. Guy Yarvin
c57ec891d3 Merge branch 'funky' 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
 2013-12-20 18:45:17 -08:00
C. Guy Yarvin
4635526a2b Double verified; about to change togas. 2013-12-20 14:26:23 -08:00
Steve Dee
0066cf7518 Get daemon mode actually working 2013-12-19 09:48:02 -08:00
C. Guy Yarvin
ef0676c5d2 %brhx is prepared to replace %brtr. 2013-12-17 17:47:20 -08:00
C. Guy Yarvin
e9bae7ceb1 Check in some imperial keyprints. 2013-12-17 11:35:45 -08:00
C. Guy Yarvin
8aa84c3d6c Fully done with cnts. Verified. 2013-12-15 01:48:16 -08:00
C. Guy Yarvin
a440b80f6e Double verified, early hxts. 2013-12-15 00:23:23 -08:00
C. Guy Yarvin
3e739d5e69 Add ~_ for type diagnosis. 2013-12-04 14:30:09 -08:00
C. Guy Yarvin
f592b16a59 Combat wake loops. 2013-11-20 22:43:12 -08:00
C. Guy Yarvin
8d779710c3 Fix playback bug for forwarded packets. 2013-11-18 14:31:51 -08:00
C. Guy Yarvin
2428015a20 Slay the line demon. 2013-11-13 14:38:04 -08:00
C. Guy Yarvin
a4baea40fd Fix a bunch of memory leaks and stuff. 2013-11-11 23:09:11 -08:00
C. Guy Yarvin
91fe182f81 Various fixes and improvements... 2013-11-08 15:37:38 -08:00
C. Guy Yarvin
f9c368d856 Various fixes and improvements. 2013-11-07 16:34:44 -08:00
C. Guy Yarvin
549d090add Various fixes and improvements. 2013-10-30 11:26:51 -07:00
C. Guy Yarvin
25b7ed9a9c Various fixes and improvements. 2013-10-26 20:55:53 -07:00
C. Guy Yarvin
91551d2f5a Changes for libuv bug reproduce. 2013-10-14 11:23:55 -07:00
Steven Dee
1a6f18d09d Consider both FreeBSD and OpenBSD "bsd" 2013-10-07 12:31:41 -04:00
C. Guy Yarvin
ab35a08774 Development "branch" goes back to production. 2013-10-06 00:44:07 -07:00
C. Guy Yarvin
fdf68275ed Hub before clay/ze refactor. 2013-10-03 13:38:37 -07:00
Lev Serebryakov
018cfe5eaf Quick'n'dirty port to FreeBSD (checked on FreeBSD 9.2/amd64) 2013-10-02 18:44:22 +04:00
Christian Carter
ea7af92024 remove a potentially misleading comment from all.h that might try and convince someone to delete all of the headers from f/. this is, of course, unadvised. 2013-09-29 09:24:24 -07:00
Christian Carter
3af3130bdc Cleaning up old code 2013-09-28 13:21:18 -07:00