Removed most of the java list stuff for less garbage collection