Still taking up too much memory