Revert "Added missing files from exiting mashup"

This reverts commit f9db10b2f42138bd6426dd8154767fc2896be4ea.