Update: started cleaning up..