Build: Remove unused methods, Move after upload