Removed garbage, prepare for merge on old one