PSD3 Sprint 1 Version 5: Remove unnecessary stuff