Removed workaround and fixed #11
Remove non-used elements