removed a bunch of file for tracking, modify view for better performance