removed scrollto and cleanup